Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Sun, 28 Jan 2018 18:56:19 +0000 (13:56 -0500)
committerTom Rini <[email protected]>
Sun, 28 Jan 2018 18:56:19 +0000 (13:56 -0500)

Trivial merge